Skip to content

Rollup of 4 pull requests #98307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 10 commits into from
Jun 21, 2022
Merged

Rollup of 4 pull requests #98307

merged 10 commits into from
Jun 21, 2022

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 10 commits June 19, 2022 16:46
@compiler-errors
Only omit trailing comma if block doesn't come from macro expansion
2c3bb42
@compiler-errors
Use Span::eq_ctxt method instead of .ctxt() == .ctxt()
52c9906
@compiler-errors
Be more hygenic with spans
3d16c22
@compiler-errors
Mention formatting macros when encountering ArgumentV1::new in const
5373d73
@liuw
Drop magic value 3 from code
c5f4880 
Magic value 3 is used to create state for a yield point. It is in fact
the number of reserved variants.

Lift RESERVED_VARIANTS out to module scope and use it instead.
@JohnTitor
Add a link to the unstable book page on Generator doc comment
51cc665 
Signed-off-by: Yuki Okushi <[email protected]>
@matthiaskrgr
Rollup merge of rust-lang#98235 - liuw:mir-gen-drop-magic-value, r=da…
eac1493 
…vidtwco

Drop magic value 3 from code

Magic value 3 is used to create state for a yield point. It is in fact
the number of reserved variants.

Lift RESERVED_VARIANTS out to module scope and use it instead.
@matthiaskrgr
Rollup merge of rust-lang#98267 - compiler-errors:suggest-wildcard-ar…
3e5800b 
…m, r=oli-obk

Don't omit comma when suggesting wildcard arm after macro expr

* Also adds `Span::eq_ctxt` to consolidate the various usages of `span.ctxt() == other.ctxt()`
* Also fixes an unhygenic usage of spans which caused the suggestion to render weirdly when we had one arm match in a macro
* Also always suggests a comma (i.e. even after a block) if we're rendering a wildcard arm in a single-line match (looks prettier 🌹)

Fixes rust-lang#94866
@matthiaskrgr
Rollup merge of rust-lang#98276 - compiler-errors:const-format-macro,…
5eb7238 
… r=oli-obk

Mention formatting macros when encountering `ArgumentV1` method in const

Also open to just closing this if it's overkill. There are a lot of other distracting error messages around, so maybe it's not worth fixing just this one.

Fixes rust-lang#93665
@matthiaskrgr
Rollup merge of rust-lang#98296 - JohnTitor:generator-unstable-book-l…
dfa933d 
…ink, r=Dylan-DPC

Add a link to the unstable book page on Generator doc comment

This makes it easier to jump into the Generator section on the unstable book.

Signed-off-by: Yuki Okushi <[email protected]>
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jun 20, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=4

@bors
Copy link
Collaborator

bors commented Jun 20, 2022

📌 Commit dfa933d has been approved by matthiaskrgr

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 20, 2022
@bors
Copy link
Collaborator

bors commented Jun 20, 2022

⌛ Testing commit dfa933d with merge fa211a74eefaa746ebd3dcd6d039c94bd4fed7b8...

@bors
Copy link
Collaborator

bors commented Jun 20, 2022

⌛ Testing commit dfa933d with merge 0887113...

@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors
Copy link
Collaborator

bors commented Jun 21, 2022

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 0887113 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 21, 2022
@bors bors merged commit 0887113 into rust-lang:master Jun 21, 2022
@rustbot rustbot added this to the 1.63.0 milestone Jun 21, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (0887113): comparison url.

Instruction count

  • Primary benchmarks: 😿 relevant regressions found
  • Secondary benchmarks: 😿 relevant regressions found
mean1 max count2
Regressions 😿
(primary)		 0.3% 0.3% 2
Regressions 😿
(secondary)		 0.7% 0.8% 6
Improvements 🎉
(primary)		 N/A N/A 0
Improvements 🎉
(secondary)		 -0.4% -0.4% 1
All 😿🎉 (primary) 0.3% 0.3% 2

Max RSS (memory usage)

Results
  • Primary benchmarks: 😿 relevant regression found
  • Secondary benchmarks: 😿 relevant regression found
mean1 max count2
Regressions 😿
(primary)		 2.7% 2.7% 1
Regressions 😿
(secondary)		 2.4% 2.4% 1
Improvements 🎉
(primary)		 N/A N/A 0
Improvements 🎉
(secondary)		 N/A N/A 0
All 😿🎉 (primary) 2.7% 2.7% 1

Cycles

Results
  • Primary benchmarks: 🎉 relevant improvement found
  • Secondary benchmarks: 🎉 relevant improvements found
mean1 max count2
Regressions 😿
(primary)		 N/A N/A 0
Regressions 😿
(secondary)		 N/A N/A 0
Improvements 🎉
(primary)		 -2.1% -2.1% 1
Improvements 🎉
(secondary)		 -2.9% -3.8% 2
All 😿🎉 (primary) -2.1% -2.1% 1

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression

Footnotes

  1. the arithmetic mean of the percent change ↩ ↩2 ↩3

  2. number of relevant changes ↩ ↩2 ↩3

@rustbot rustbot added the perf-regression Performance regression. label Jun 21, 2022
@Mark-Simulacrum Mark-Simulacrum added the perf-regression-triaged The performance regression has been triaged. label Jun 21, 2022
@matthiaskrgr matthiaskrgr deleted the rollup-rb3huha branch July 30, 2022 10:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.63.0
Development

Successfully merging this pull request may close these issues.
9 participants
@matthiaskrgr @bors @rust-log-analyzer @rust-timer @Mark-Simulacrum @rustbot @compiler-errors @liuw @JohnTitor